Last fix introduced an error, needs to fix this with proper splitting
Updated to new version