Fixed something with #196