Missed something out from last commit. This should yet again close #3