Fixed #65 for now (if really needed, others should be implemented)