Added temp. exception. Take 2.