Almost fixed! (by allan)