Make this a bugfix (planned v0.4.1)