Fix for weight related issues