Fix joshs bug