Bug fix regarding a problem reported by user @blink2014