Possible fix of weird actions bug