this is better now, fixes #2