solved issue #3 (also date picker affected)