Dirty hack and comment