Fixes #56 - Temporary fix, needs to be re-implemented