Fixed #394