Removing hard rewriting of defaults var - should fix #5