Fixed, tested to work.