Fixed #262