WTF bug fixed