Fixed #278