ADDED check on int