Fixed not found design pattern