Fix for Tolstyak/Sick-Beard #40