Fixed #388