Reverting Previous Fixes as it Errors on New Entries - Reopens #1