Bug fix #11