addressed fixme

..