Fixes #4?