[BUGFIX] Fixed bug in implementation for #63