Single line comments moved down by formatter

Hi there, thanks for the great plugin!  I tried running this code under the formatter:

object TestMain {
  val x = 123  //one hundred and twenty three
  val y = "hello" //hi there
  def main(args: Array[String]) {
    val z = "test z" //zee test
  }
}

and it returns this:

object TestMain {
  val x = 123
  //one hundred and twenty three
  val y = "hello"
  //hi there
  def main(args: Array[String]) {
    val z = "test z" //zee test
  }
}

The main problem is that the single line comments for fields are moved down, which is confusing because it makes it appear like it refers to the next line, such as:

  //one hundred and twenty three
  val y = "hello"

The formatting works properly for variables, just not for fields.  Is there a formatter setting to allow single-line comments to remain next to fields?  (Or is this discouraged as poor style, or a deficiency in the formatter, or maybe fixed in newer plugin versions)?

Thanks!
Sam