Attempt to fix #3778 by creating less member attributes, real problem will be addressed in a later release