Fixed for broken code