Resolved and tested #6