This one should work a bit better than previous fix.