Fixed better code