fixes #23 (hopefully the last time)