Fix for Build 0.76