Improved syntax as suggested by Jean-Luc