Incorporate Nathan's fix