Works again
Fixed #385
Fixed #386