Removed filter; With reference to issue #15