fixed bug: #6