Issue #647
Fixed label displaying