Code fix for SE