Attempted fix for Bug #105