Make RF keyword more reliable