Bug fix
Application specific, does make sense being here