Fix behavior of @