Fix for Eric's request