Fix for counter layouts