Fixed bug in 7f2a490