Restored mechanism from previous commit

@651a99f2119dd6d844238029ef53330364858d4f