Fix for member variables