Associate this to issue. Fixed #1