Fix for the last fix (escapes not right)