Fix for tooltip disappearing issue (#39)