fixed issues with compiling handling all cases