Quick "fix" for zdennis#129, take 2