Implemented assertion, resolving TODO