Fix last error with a crazy solution