Fix for the current signal loading problem in haystack.