Fix for counter