Fixing regression fron fixing #23