Fix for insight #2