Better fix for overloading issues (See #179)