Quick fix for null constructor bug