Fixed stackoverflow issue with setter...