Possible fix of weird actions bug (See #206)