- Added bug check.