Fix for bug in 0f2f2081bce879e5537c2a3c4364d67fe3e85746