Revised commit due to Mloc's suggestion.