Fixed #1: Miscalulation of score fixed