Issue278 - fix #278