fixes #2

please don't merge yet - not tested, PR written on GH while on transit ^^