Issue #605 fixed. Double rendering removed