Add suggestion from Stefan Bucur.