Bug fix #176 prevention layout