Commented, fixed behaviour