#42 Action fixup