Fixed solution to be release worthy.