Most likely fixing #382