hack and a fix