Fixing RFC Issue