Fix for issue #177 - `div` bug

We need to go through the code base and find where we need to do this check.