Stable 47: Fixed #52