Fixes #40

This should just fix it with minimal fuss.