Fix for eb330db
Fix for b0a4c2e