FIXED: issue#2