bugfix: bad layout on Windows 7
merged with master