Fix for fixme-matt bug