FS-6267 I was able to replicate this issue, I've tweaked this to prevent -n