Fixed #303