Fixed Constructor Again