Bug Fix: Works with multi-digit numbers