Commented code that might be the cause of issue #120