Fix for resolved issues