Fix luke's bug