Fix #58 implemented previous funcionality