Actually fixes #156!