RP: Added suggestion by Maarten