Fixed #400