Fix for bug in 470e5bd