Bug Fix: Number spacing handling