Issue with SpaceAroundControlStructures and comments on top of control structure

Hi there, lovely tool. I've been using it for a few days and I'm loving it already. I'm having a little issue though with comments on top of control structures when I use the "SpaceAroundControlStructures" formatter. Basically, all the spaces before the comments are getting removed, and is not intended properly anymore. I attached a screenshot.


Not sure if it's a problem of combination with some other options (I'm using a lot). I can put the list here if needed. Anything I can do to give a hand?