Fix for longer base