EQ Notice: removed short testing hack