Hmm... possible fix for broken 1.5.1?