Fixed #327