FIX: fix for the previous merge