Fixed for real now - tested works fine.