added once wrapper for click event as temp fix?