Fixes #43, this time in develop :/