migrate pr #36

:scream: