Fixes #1 and background