Fix for custom starting point