Fixed #287