Bug fix #278