actually  #123 was not really working correctly after all