Fix for MERCH-52