Fixed problems introduced by Rick