Fixing Issue401

No need to check type