diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf
index e5d22fdcddda11b479363714560b2ec73a0182bb..4966811b652073c67e79fbaec251a6c0390307d6 100644
--- a/ps-grammar/gprs/gprs.jsgf
+++ b/ps-grammar/gprs/gprs.jsgf
@@ -34,7 +34,7 @@ public <task> = [<robot_name>] [(would | could) you] [please] <command> [please]
 <snack_class> = chocolate_cookies | chips | biscuits | bread | pringles | (strawberry cookies);
 <food_class> = baby_food | crackers | coffee | yeast | noodles | beans; 
 
-<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | <exit_class> | exit | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <door_class> | <exit_class> | exit | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
 
 <second_location> = <appliance_class> | <shelf_class> | <seat_class> | <room_class> | <table_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
 
diff --git a/ps-grammar/location/location.jsgf b/ps-grammar/location/location.jsgf
index 13468d47924e87ba7a1fc5269015862d54836a16..225266629611c9d566fd7f54dc0bee7bb13a8073 100644
--- a/ps-grammar/location/location.jsgf
+++ b/ps-grammar/location/location.jsgf
@@ -6,7 +6,7 @@ public <statement> = <locationPhrase> [please];
 
 <verb> = go | search | learn | remember | memorize;
 
-<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <door_class> | <exit_class> | <everywhere_class>;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <door_class> | <exit_class> | <everywhere_class>;
 
 <appliance_class> = waste_bin | fridge | stove;
 <shelf_class> = bar | side_board | (right side_table) | (left side_table);