Bug Fix which was miss-interpreting the input type