Minor issue resolved (event handler bugfixed!!!)