Fixed #438