Alternative to #56