Fixed #267