Fixes #40 again