Fixing overload issue (Closes #179)