Moved prefix check to very end of each action