Fix Justin's code