Fixed #386