Fixes #351 Fixes #285

Fixes #351 
Fixes #285

#285 was a typo