Fix for unused code