NOW it should work better