Eliminate flash issue
Issue #52