fix hardcodings