By Benjamin, fixed bug 2458