removed ugly int handler