Add callable

added small safety check