:global / controller / minor bug fix