Add another check to handle multiple calling styles

Add another check to handle multiple calling styles #305