fixed 54 and a bug where unclear positioning wasn't detected
Authored by: eziomacmanus 2016-09-01
Parent: [r118]
Child: [r120]
