Add comments for the workaround