porting over bugfix for new windows
Merge branch 'develop' into ui/dev