BUGFIX: Can't cast String to Integer
BUGFIX: Can't cast String to Integer