Fixing #36