Fixed issues with inconsistently setting