Partial bug fix on default behaviou