Core: Update fix for #299 based on feedback comments