Fixes aug 9