Last try for making this work, fixes #3