Fixes #480 I need more coffee